merge trunk
authorKenichi Handa <handa@m17n.org>
Mon, 26 Dec 2011 03:35:18 +0000 (12:35 +0900)
committerKenichi Handa <handa@m17n.org>
Mon, 26 Dec 2011 03:35:18 +0000 (12:35 +0900)

Trivial merge